Skip to content

Conversation

@linawolf
Copy link
Member

  • Link to related topics
  • Demonstrate what the corresponding XLIFF files look like
  • use f:format.html or f:sanitize.html and not format.raw as best practice
  • Explain using placeholders and arguments
  • Demonstrate using a translation in an alt tag

Releases: main, 13.4, 12.4

* Link to related topics
* Demonstrate what the corresponding XLIFF files look like
* use f:format.html or f:sanitize.html and not format.raw as best practice
* Explain using placeholders and arguments
* Demonstrate using a translation in an alt tag

Releases: main, 13.4, 12.4
@linawolf linawolf merged commit 7e73abf into main Mar 19, 2025
2 checks passed
@linawolf linawolf deleted the task/update branch March 19, 2025 15:47
@github-actions
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c1baf7b... [TASK] Update translate ViewHelper page
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging Documentation/Global/Translate.rst
CONFLICT (content): Merge conflict in Documentation/Global/Translate.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-114-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c1baf7b34065072888f6e7d8314547fe8b634472,58efcd209ec4d1db2e199e2a293e489a1f3ef960
# Push it to GitHub
git push --set-upstream origin backport-114-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-114-to-12.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants